fix stPreCompiledContracts empty expect

author: Dimitry <dimitry@ethereum.org> 2018-02-16 01:59:47 +0800
committer: Dimitry <dimitry@ethereum.org> 2018-02-16 01:59:47 +0800
commit: f62640eeabf3066fa9726c8a61dfa5d50e7daf44 (patch)
tree: 29090a23ca6c34b99a5ff3905637118b19b78909 /src
parent: 772a3d69a704e0670f567abefb6608f942136693 (diff)
download: tangerine-tests-f62640eeabf3066fa9726c8a61dfa5d50e7daf44.tar
tangerine-tests-f62640eeabf3066fa9726c8a61dfa5d50e7daf44.tar.gz
tangerine-tests-f62640eeabf3066fa9726c8a61dfa5d50e7daf44.tar.bz2
tangerine-tests-f62640eeabf3066fa9726c8a61dfa5d50e7daf44.tar.lz
tangerine-tests-f62640eeabf3066fa9726c8a61dfa5d50e7daf44.tar.xz
tangerine-tests-f62640eeabf3066fa9726c8a61dfa5d50e7daf44.tar.zst
tangerine-tests-f62640eeabf3066fa9726c8a61dfa5d50e7daf44.zip
505 files changed, 50837 insertions, 232 deletions
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g1v0Filler.json
index 245fb14e9..2c76329d8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ead7c",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615284",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ead7c",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615284",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g2v0Filler.json
index 6044ebd98..c8bc88e96 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ead7c",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615284",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ead7c",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615284",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g3v0Filler.json
index a416640eb..045eba51e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ead7c",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615284",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ead7c",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615284",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g1v0Filler.json
index 2be2aecf4..e54977e6e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ead7c",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615284",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ead7c",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615284",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g2v0Filler.json
index 31f836f98..869a1d680 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ead7c",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615284",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ead7c",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615284",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g3v0Filler.json
index 461f5720f..4b244e0a1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ead7c",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615284",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ead7c",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615284",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g1v0Filler.json
index e3ee6382d..68a065486 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g2v0Filler.json
index 7112e1a0d..83ff57435 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g3v0Filler.json
index 959c91e25..fd9da5216 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g1v0Filler.json
index dcf622351..6486b4f7d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g2v0Filler.json
index d59221362..37acb0b54 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g3v0Filler.json
index 9df45175e..0a65f8a0f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g1v0Filler.json
index 5518fe1e7..7af749105 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g1v0Filler.json
@@ -26,6 +26,168 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g2v0Filler.json
index f2b89bcb2..506266211 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g2v0Filler.json
@@ -26,6 +26,168 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g3v0Filler.json
index 4c278fe95..758c6e701 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500_d0g3v0Filler.json
@@ -26,6 +26,168 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g1v0Filler.json
index cd0631d03..a7d422e24 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g2v0Filler.json
index 14e01490e..bb0177ed4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g3v0Filler.json
index f8e950388..b96d912aa 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g1v0Filler.json
index c51b46c9c..394dedfcd 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g2v0Filler.json
index 59b7bd17c..5f1f37fcc 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g3v0Filler.json
index a38f4be5e..703f61348 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g1v0Filler.json
index e714c1454..9ca4d8cd4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g2v0Filler.json
index b45a17da2..d130b5ca1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g3v0Filler.json
index f4d6367ff..2eb6f10fc 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g1v0Filler.json
index 80ab3e025..879ce9a13 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g2v0Filler.json
index da3a4b62c..b86a5c35e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g3v0Filler.json
index 0e551449e..a65f6f91d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g1v0Filler.json
index 058c6d6f2..9a9dd5db7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g2v0Filler.json
index 31efa7c96..318d2fcd0 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g3v0Filler.json
index 43ef3af7a..bb8dbf14a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g1v0Filler.json
index f0e0d8ed1..921dd6759 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g1v0Filler.json
@@ -26,6 +26,168 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g2v0Filler.json
index 147efd759..24e01e93d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g2v0Filler.json
@@ -26,6 +26,168 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g3v0Filler.json
index b485356c6..80d3d7c42 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500_d0g3v0Filler.json
@@ -26,6 +26,168 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g1v0Filler.json
index 565d3f34c..681aa4931 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g2v0Filler.json
index 673c9b1f9..cd353ee8a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g3v0Filler.json
index f2540e8f6..f51615ea5 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g1v0Filler.json
index 9e34bf490..3e4fa8ae6 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g2v0Filler.json
index 40fe67712..c74f22e24 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g3v0Filler.json
index 04a04ee28..cd3387f83 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g1v0Filler.json
index d084d5e05..080aeb43f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g2v0Filler.json
index 0449dabd1..f7307cbd2 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g3v0Filler.json
index 81a9b545b..66761fabc 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g1v0Filler.json
index cb8390727..9813b1fbf 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g2v0Filler.json
index a3c7132a7..2e7a00263 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g3v0Filler.json
index 776fc6e51..5ba00f975 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g1v0Filler.json
index 2849cb9f0..92eee2e02 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g2v0Filler.json
index 8a9ac5086..2742517ba 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g3v0Filler.json
index bc5de04de..325829b0d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g1v0Filler.json
index 6b60e097d..5f4ce284d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g1v0Filler.json
@@ -26,6 +26,168 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g2v0Filler.json
index d6456a874..cb1bd9d28 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g2v0Filler.json
@@ -26,6 +26,168 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g3v0Filler.json
index fdb5df04f..6b8edad7f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500_d0g3v0Filler.json
@@ -26,6 +26,168 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g1v0Filler.json
index 05dca94b4..eed8aa9b6 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g2v0Filler.json
index 1fdfe0f49..140b5f80e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g3v0Filler.json
index 23b0bd979..8f1113944 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g1v0Filler.json
index c77932357..dbd785191 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g2v0Filler.json
index 979a2c6f0..66d0d7d90 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g3v0Filler.json
index 1d6d00af1..80aa05868 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g1v0Filler.json
index c3c3bbe61..e204e82d1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g2v0Filler.json
index b2e73d86a..1798e0b3e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g3v0Filler.json
index 1b520b8cc..77e3f853d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eae7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615181",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g1v0Filler.json
index d763c00a7..51d7720e4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g2v0Filler.json
index 89d903bb2..eb381cc87 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g3v0Filler.json
index 738e35a87..f81e0fc9b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g1v0Filler.json
index 010e4d610..06001bec1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g2v0Filler.json
index f8665f256..bc04bdb0a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g3v0Filler.json
index e8e17b2fb..86033f6fe 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g1v0Filler.json
index 893fa4067..608f09933 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g1v0Filler.json
@@ -26,6 +26,168 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g2v0Filler.json
index c809d28f4..1709dba5a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g2v0Filler.json
@@ -26,6 +26,168 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g3v0Filler.json
index c64f3d41d..32c015deb 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500_d0g3v0Filler.json
@@ -26,6 +26,168 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g1v0Filler.json
index 9c76443dc..ca079d604 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g2v0Filler.json
index 9660480b3..d83daea53 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g3v0Filler.json
index 5f5197738..99d94eb38 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g1v0Filler.json
index 2eb9cae46..612691df6 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g2v0Filler.json
index 0b328daff..a6ce3abdc 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g3v0Filler.json
index 93a6f786b..3f6b79a07 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g1v0Filler.json
index 4dab82727..fc73b6fe0 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g2v0Filler.json
index 402f39c78..c0ea07f8e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g3v0Filler.json
index 710daf3d0..49e42c4cf 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaeff",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615101",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g1v0Filler.json
index ca0fce9aa..a5e357cf4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g2v0Filler.json
index 8063f4936..1b47830a1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g3v0Filler.json
index 92494cce3..f1e31f7b4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g1v0Filler.json
index 2eb0b208d..8ce0dcc72 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g2v0Filler.json
index ce7690980..36938ea46 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g3v0Filler.json
index 2bbabda58..f02901ddf 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g1v0Filler.json
index eb09ffc23..d51dc26d3 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g1v0Filler.json
@@ -26,6 +26,168 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g2v0Filler.json
index 81ec21f7c..6de46e6f9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g2v0Filler.json
@@ -26,6 +26,168 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g3v0Filler.json
index 78570f190..a032885e0 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500_d0g3v0Filler.json
@@ -26,6 +26,168 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g1v0Filler.json
index 37d62779b..eaf4978f2 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g2v0Filler.json
index 5df05602f..d6476e390 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g3v0Filler.json
index 78515b451..a8da30be9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g1v0Filler.json
index ef933dc09..9db1faa1f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g2v0Filler.json
index 90aa5ba3c..692e03b77 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g3v0Filler.json
index d8b1bf0d5..f09c9e32d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g1v0Filler.json
index ab1db684e..d215d9a12 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g2v0Filler.json
index c864b2033..20858bd54 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g3v0Filler.json
index 65d6b6b58..d001accea 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g0v0Filler.json
index 00e6de8d8..04e542383 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g0v0Filler.json
@@ -86,14 +86,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62ef4c2",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a7610b3e",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
@@ -168,14 +166,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62ef4c2",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a7610b3e",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g1v0Filler.json
index 9129798c5..b55791cba 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g1v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g2v0Filler.json
index 3e3ed10b3..8c00305d7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g2v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g3v0Filler.json
index 1ec35ec93..d240a727b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000_d0g3v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g1v0Filler.json
index f9c777b5e..dd1ae639e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g1v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g2v0Filler.json
index 155de4c8e..c13d84d75 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g2v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g3v0Filler.json
index 907a350a5..8146eb4ce 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000_d0g3v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g0v0Filler.json
index 71ab7edce..935e4d269 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g0v0Filler.json
@@ -86,14 +86,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af630fb4a",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a75f04b6",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
@@ -168,14 +166,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af630fb4a",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a75f04b6",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g1v0Filler.json
index 58c19f93f..d9d9f61b8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g1v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g2v0Filler.json
index 2146da45b..e4e1ced60 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g2v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g3v0Filler.json
index a306bde77..707ab9410 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000_d0g3v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g0v0Filler.json
index 54e572151..28fc91165 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g0v0Filler.json
@@ -86,14 +86,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62eede6",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a761121a",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
@@ -168,14 +166,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62eede6",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a761121a",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g1v0Filler.json
index b212cfb4c..4afa27b23 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g1v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g2v0Filler.json
index 689afd02f..a45e46a45 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g2v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g3v0Filler.json
index 88c2a6245..ceb27b79c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500_d0g3v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g0v0Filler.json
index ca8cfdb7f..77818e0f0 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g0v0Filler.json
@@ -86,14 +86,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62ef3c2",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a7610c3e",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
@@ -168,14 +166,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62ef3c2",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a7610c3e",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g1v0Filler.json
index 27396c6c4..cd7234670 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g1v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g2v0Filler.json
index 2b94e4f7c..91ffae26a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g2v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g3v0Filler.json
index 4a848c9b2..368a99686 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000_d0g3v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g0v0Filler.json
index 9c58429f9..a251a82cf 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g0v0Filler.json
@@ -86,14 +86,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62eff7a",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a7610086",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
@@ -168,14 +166,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62eff7a",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a7610086",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g1v0Filler.json
index be8830d79..89ede6c00 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g1v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g2v0Filler.json
index ec2622570..d429bd998 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g2v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g3v0Filler.json
index 258dd5a0f..b9bc6bcd4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000_d0g3v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g0v0Filler.json
index a5ed0ff64..56a54c70a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g0v0Filler.json
@@ -86,14 +86,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62f268a",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a760d976",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
@@ -168,14 +166,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62f268a",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a760d976",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g1v0Filler.json
index a8f3109a4..2d617a25d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g1v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g2v0Filler.json
index fc5f0db96..2335ce070 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g2v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g3v0Filler.json
index 3a5bce92a..55d42aa79 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000_d0g3v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g1v0Filler.json
index ae36a8a90..b39d4763d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g1v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g2v0Filler.json
index 9bb2d301a..32550484d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g2v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g3v0Filler.json
index a79d1f5a8..8168c593f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000_d0g3v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g0v0Filler.json
index a77aea204..99f41e933 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g0v0Filler.json
@@ -86,14 +86,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af630fc4a",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a75f03b6",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
@@ -168,14 +166,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af630fc4a",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a75f03b6",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g1v0Filler.json
index e831ca940..1b0a4dea9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g1v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g2v0Filler.json
index fc10f8f49..19d5ebf35 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g2v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g3v0Filler.json
index a9ebb013c..9a3a05cc4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000_d0g3v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g0v0Filler.json
index 22f0a2650..7e8926f8c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g0v0Filler.json
@@ -86,14 +86,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62eeee6",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a761111a",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
@@ -168,14 +166,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62eeee6",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a761111a",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g1v0Filler.json
index 4a7e6718b..1e912bd60 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g1v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g2v0Filler.json
index 39250c375..48e37aa4f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g2v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g3v0Filler.json
index 926106ec9..efe6a3f07 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500_d0g3v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g0v0Filler.json
index 3fa71ec61..8f4310703 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g0v0Filler.json
@@ -86,14 +86,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62f007a",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a760ff86",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
@@ -168,14 +166,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62f007a",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a760ff86",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g1v0Filler.json
index 89912f9ed..8ed33d7e4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g1v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g2v0Filler.json
index 8df0ce725..621f955f8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g2v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g3v0Filler.json
index e5fe7f0f6..72111c535 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000_d0g3v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g0v0Filler.json
index 7c413996f..c164d28ed 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g0v0Filler.json
@@ -86,14 +86,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62f278a",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a760d876",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
@@ -168,14 +166,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62f278a",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a760d876",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g1v0Filler.json
index 91e1b6406..f069339d8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g1v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g2v0Filler.json
index f1ec90207..a7920ecf6 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g2v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g3v0Filler.json
index e12449f39..08964552d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000_d0g3v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g1v0Filler.json
index 197b06211..902fed730 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g1v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g2v0Filler.json
index 65e94e528..d3628cd18 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g2v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g3v0Filler.json
index aa68da955..95d49916c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000_d0g3v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g0v0Filler.json
index bc3928779..6030f2108 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g0v0Filler.json
@@ -86,14 +86,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af6311d8a",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a75ee276",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
@@ -168,14 +166,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af6311d8a",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a75ee276",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g1v0Filler.json
index 5f74561e3..d8c96410a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g1v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g2v0Filler.json
index 23495a447..60c6f72ca 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g2v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g3v0Filler.json
index 9bfa4956e..55c7024a8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000_d0g3v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g0v0Filler.json
index fa2a78ac3..f6f88bd4a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g0v0Filler.json
@@ -86,14 +86,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62f1026",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a760efda",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
@@ -168,14 +166,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62f1026",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a760efda",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g1v0Filler.json
index d31ea76a5..144e5115d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g1v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g2v0Filler.json
index 72a4184a6..d0d44a506 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g2v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g3v0Filler.json
index 02a14cb31..30671a6fe 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500_d0g3v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g0v0Filler.json
index 006529079..2528b1578 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g0v0Filler.json
@@ -86,14 +86,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62f1602",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a760e9fe",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
@@ -168,14 +166,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62f1602",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a760e9fe",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g1v0Filler.json
index 8f248b024..910c8dc27 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g1v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g2v0Filler.json
index ee74dbab6..a0af17661 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g2v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g3v0Filler.json
index 90a49ed8c..dfe57b64c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000_d0g3v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g0v0Filler.json
index 1b02afc1c..7ee33550b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g0v0Filler.json
@@ -86,14 +86,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62f21ba",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a760de46",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
@@ -168,14 +166,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62f21ba",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a760de46",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g1v0Filler.json
index 55ce8cb6e..91b61af3d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g1v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g2v0Filler.json
index 680a1ff7e..b1a1d6938 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g2v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g3v0Filler.json
index b1b0c57be..d563a8a2f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000_d0g3v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g0v0Filler.json
index 9f35a8198..71be4a440 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g0v0Filler.json
@@ -86,14 +86,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62f48ca",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a760b736",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
@@ -168,14 +166,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62f48ca",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a760b736",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g1v0Filler.json
index a343bed8d..3b1ab3ec5 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g1v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g2v0Filler.json
index 3db3c1d56..e7a68d317 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g2v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g3v0Filler.json
index 5e27cb91d..d3ebe16e4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000_d0g3v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g1v0Filler.json
index d705c74cf..3931bc46a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g1v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g2v0Filler.json
index e959bf3ea..45dbcc653 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g2v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g3v0Filler.json
index a5a6cc68a..980139b1a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000_d0g3v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g0v0Filler.json
index 0c2eb82a6..bfe2889ca 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g0v0Filler.json
@@ -86,14 +86,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af630fc4a",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a75f03b6",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
@@ -168,14 +166,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af630fc4a",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a75f03b6",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g1v0Filler.json
index ddfa1aab2..d8687b642 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g1v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g2v0Filler.json
index 496b250e6..b07b29517 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g2v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g3v0Filler.json
index bbc1180a2..7e150e861 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000_d0g3v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g0v0Filler.json
index 3cb9d47da..78904cc2f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g0v0Filler.json
@@ -86,14 +86,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62eeee6",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a761111a",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
@@ -168,14 +166,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62eeee6",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a761111a",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g1v0Filler.json
index d6c470de8..8837dfd5e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g1v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g2v0Filler.json
index afec0ff28..932592d63 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g2v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g3v0Filler.json
index d1ceceeb9..848fe26ca 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500_d0g3v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g0v0Filler.json
index 4244e7c84..4bacfd560 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g0v0Filler.json
@@ -86,14 +86,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62ef4c2",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a7610b3e",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
@@ -168,14 +166,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62ef4c2",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a7610b3e",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g1v0Filler.json
index fb8489639..eff29f531 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g1v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g2v0Filler.json
index 5b6b00d2e..585db3967 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g2v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g3v0Filler.json
index 19672d4f7..d68a4c50e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000_d0g3v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g0v0Filler.json
index f1df851b2..e60e9f651 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g0v0Filler.json
@@ -86,14 +86,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62f007a",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a760ff86",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
@@ -168,14 +166,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62f007a",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a760ff86",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g1v0Filler.json
index 21351e081..0730f959f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g1v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g2v0Filler.json
index aaa3b5bc7..705047449 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g2v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g3v0Filler.json
index 27b01c410..425716c29 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000_d0g3v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g0v0Filler.json
index bbd766231..fcb5494f1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g0v0Filler.json
@@ -86,14 +86,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62f278a",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a760d876",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
@@ -168,14 +166,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62f278a",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a760d876",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g1v0Filler.json
index 8708f818c..35e8107f9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g1v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g2v0Filler.json
index 80303ec1b..269a46379 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g2v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g3v0Filler.json
index ce68ca710..6f3e85905 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000_d0g3v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g1v0Filler.json
index ef219dc13..6a0037b43 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g1v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb882",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb882",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g2v0Filler.json
index bea20198f..3f3d8e760 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g2v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb882",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb882",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g3v0Filler.json
index e197288ee..f7071e196 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000_d0g3v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb882",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb882",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g1v0Filler.json
index f3d81464e..8bed7f227 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g1v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb882",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb882",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g2v0Filler.json
index 90b7f61fa..7615955bd 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g2v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb882",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb882",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g3v0Filler.json
index 84468b05d..2b1a1152e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000_d0g3v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb882",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb882",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g1v0Filler.json
index 83a16b4b1..b178f443b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g1v0Filler.json
@@ -26,6 +26,168 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g2v0Filler.json
index b01945673..efe652240 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g2v0Filler.json
@@ -26,6 +26,168 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g3v0Filler.json
index 599c451a7..71a83e06a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500_d0g3v0Filler.json
@@ -26,6 +26,168 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g1v0Filler.json
index 301507d52..9b71c2d2b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g1v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb882",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb882",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g2v0Filler.json
index b93429a9b..3612b0f80 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g2v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb882",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb882",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g3v0Filler.json
index ae51e7011..a9ea16440 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000_d0g3v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb882",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb882",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g1v0Filler.json
index b4a58cac7..ad5f32d10 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g1v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb882",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb882",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g2v0Filler.json
index 8aacb91b1..260437d40 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g2v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb882",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb882",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g3v0Filler.json
index 0700322e6..fbca434b9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000_d0g3v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb882",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb882",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g1v0Filler.json
index 9f81cf260..ab63b8a46 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g1v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb882",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb882",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g2v0Filler.json
index 8cb62b226..dfc1326c3 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g2v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb882",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb882",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g3v0Filler.json
index 1041caf88..04457cc3a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000_d0g3v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb882",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb882",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g1v0Filler.json
index e78a24845..555bedd1c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g1v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ee6a1",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ee6a1",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g2v0Filler.json
index 7d5a774e5..50fea451d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g2v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ee6a1",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ee6a1",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g3v0Filler.json
index 91c1d987f..a5adf3d40 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000_d0g3v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ee6a1",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ee6a1",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g1v0Filler.json
index cd5162dcb..7b6bd975b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g1v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ee6a1",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ee6a1",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g2v0Filler.json
index 450f2e6f0..1df0d225b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g2v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ee6a1",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ee6a1",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g3v0Filler.json
index 3b5ee515c..3edc19565 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000_d0g3v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ee6a1",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ee6a1",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g1v0Filler.json
index 213e50a4a..28a0a032d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g1v0Filler.json
@@ -26,6 +26,168 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g2v0Filler.json
index 58e16e755..6846d19e6 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g2v0Filler.json
@@ -26,6 +26,168 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g3v0Filler.json
index 8acda21f5..113bced6c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000_d0g3v0Filler.json
@@ -26,6 +26,168 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g1v0Filler.json
index afbd92828..8eccdc08f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g1v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ee6a1",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ee6a1",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g2v0Filler.json
index c47274710..55b76d882 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g2v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ee6a1",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ee6a1",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g3v0Filler.json
index 1d73bdfe2..3eeeea58f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000_d0g3v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ee6a1",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ee6a1",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g1v0Filler.json
index 68eacf7e1..6f6beaf8c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g1v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ee6a1",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ee6a1",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g2v0Filler.json
index f869c66fd..7ee972b43 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g2v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ee6a1",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ee6a1",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g3v0Filler.json
index f9f67b808..3a7a254b5 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000_d0g3v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ee6a1",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ee6a1",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g1v0Filler.json
index 4742d6d01..19ad72155 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g1v0Filler.json
@@ -26,6 +26,168 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g2v0Filler.json
index 43af74bc1..2e031f0b7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g2v0Filler.json
@@ -26,6 +26,168 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g3v0Filler.json
index ff74ff0aa..0bc89107e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500_d0g3v0Filler.json
@@ -26,6 +26,168 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g1v0Filler.json
index 835130b71..0b847d2fc 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g2v0Filler.json
index b4d9f530d..6e25a56aa 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g3v0Filler.json
index f2a41a3c6..7fbbee2d8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g1v0Filler.json
index 40af1adf8..ff1238acf 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g2v0Filler.json
index 72c14882b..75fbadd4c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g3v0Filler.json
index 05cf2223e..4c8dc2e6e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g1v0Filler.json
index c86e5eddc..696347b53 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g2v0Filler.json
index c54618000..2b5767953 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g3v0Filler.json
index b30360e2d..3261fbb07 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g1v0Filler.json
index de16adde9..3f80f3fe1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g2v0Filler.json
index 5b7f74aa1..656903986 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g3v0Filler.json
index 255d1a288..aff395c5f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g1v0Filler.json
index 7cea8069e..da78c9aa2 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g2v0Filler.json
index 911a7b5ff..5b28c8ad2 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g3v0Filler.json
index d75175610..fd927e311 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g1v0Filler.json
index 81339c171..a66eeb508 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g2v0Filler.json
index fa28d4f6e..980e15624 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g3v0Filler.json
index 83ae3d240..495a5ca19 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eaf7f",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7615081",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g1v0Filler.json
index ec9d3b3a3..47250f900 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g1v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g2v0Filler.json
index 3dce312fb..d8f07021b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g2v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g3v0Filler.json
index 0e27ddc88..47f2e6730 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000_d0g3v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g1v0Filler.json
index 9be7b1588..aab457f70 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g1v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g2v0Filler.json
index c31d427dd..4680efbde 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g2v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g3v0Filler.json
index 5ad9b1882..2d1be192c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000_d0g3v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g1v0Filler.json
index 4188b284e..98c48e14a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g1v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7614fff",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7614fff",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g2v0Filler.json
index 85626b0a0..fa17e22c4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g2v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7614fff",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7614fff",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g3v0Filler.json
index 867478591..27fa6470c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500_d0g3v0Filler.json
@@ -26,6 +26,172 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7614fff",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "balance" : "0x0de0b6b3a7614fff",
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g1v0Filler.json
index 60a5b7e08..58763b0c1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g1v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g2v0Filler.json
index 84d1a9754..20fc85f1d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g2v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g3v0Filler.json
index 276c30a63..036feb4ba 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000_d0g3v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g1v0Filler.json
index 09394cac7..c49896485 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g1v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g2v0Filler.json
index f33d668ea..e2c1ff5a3 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g2v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g3v0Filler.json
index 408ec8874..e82e70714 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000_d0g3v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g1v0Filler.json
index 1ff6d24d7..76e0e0033 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g1v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g2v0Filler.json
index 15f65e938..ca8cc64bc 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g2v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g3v0Filler.json
index 237f40ec3..370d5176f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000_d0g3v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62eb001",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g1v0Filler.json
index 02700a244..bf2732c52 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g1v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ef765",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ef765",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g2v0Filler.json
index 179c8148a..ee06ecf58 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g2v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ef765",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ef765",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g3v0Filler.json
index 4572a9867..2b0949750 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000_d0g3v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ef765",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ef765",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g1v0Filler.json
index 7b94a80b3..83147779f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g1v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ef765",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ef765",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g2v0Filler.json
index 3d6d7afaa..245abf42c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g2v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ef765",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ef765",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g3v0Filler.json
index af7ddde4d..5f9ba357f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000_d0g3v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ef765",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ef765",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g1v0Filler.json
index a271cfaa5..e29602d80 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g1v0Filler.json
@@ -26,6 +26,168 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g2v0Filler.json
index 179d6e825..8cc13aa34 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g2v0Filler.json
@@ -26,6 +26,168 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g3v0Filler.json
index 5714fe4d2..3a71ae603 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500_d0g3v0Filler.json
@@ -26,6 +26,168 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g1v0Filler.json
index 6c11b5b5d..7e69666c1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g1v0Filler.json
@@ -26,6 +26,168 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g2v0Filler.json
index 10941da58..6ea85c099 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g2v0Filler.json
@@ -26,6 +26,168 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g3v0Filler.json
index cc93a590e..cbd62918c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000_d0g3v0Filler.json
@@ -26,6 +26,168 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g1v0Filler.json
index c6efe3fb0..11cf3db42 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g1v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ef765",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ef765",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g2v0Filler.json
index fd24524df..a02680394 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g2v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ef765",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ef765",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g3v0Filler.json
index 8a5b8571d..c820d37a4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000_d0g3v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ef765",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ef765",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g1v0Filler.json
index fc52274aa..7dea907fb 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g1v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ef765",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ef765",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g2v0Filler.json
index 7e48ed8a4..028e77049 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g2v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ef765",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ef765",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g3v0Filler.json
index dd6dbc521..cdd8a26ca 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000_d0g3v0Filler.json
@@ -26,6 +26,170 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ef765",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "balance" : "0x29a2241af62ef765",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                            "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g1v0Filler.json
index 0adccc521..bb3fa88e4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g1v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g2v0Filler.json
index 5775b8528..3f1339e6c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g2v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g3v0Filler.json
index 4aac26b0f..42bd46cb8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000_d0g3v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g0v0Filler.json
index f4aa2bdac..7ad867ba6 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g0v0Filler.json
@@ -86,14 +86,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af630fc4a",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a75f03b6",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
@@ -168,14 +166,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af630fc4a",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a75f03b6",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g1v0Filler.json
index cf73a7bfa..eed4a1c3d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g1v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g2v0Filler.json
index 23d98b4b4..a4ade6adc 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g2v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g3v0Filler.json
index 9ca3a3a04..39cbc0412 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000_d0g3v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g0v0Filler.json
index 879452c3d..0ea4c76c7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g0v0Filler.json
@@ -86,14 +86,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62eeee6",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a761111a",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
@@ -168,14 +166,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62eeee6",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a761111a",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g1v0Filler.json
index b27d0c1f7..0c12de37d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g1v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g2v0Filler.json
index 702618030..bf5df767b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g2v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g3v0Filler.json
index 7e6926bea..99973aa0c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500_d0g3v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g0v0Filler.json
index 331072828..e3fac56e1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g0v0Filler.json
@@ -86,14 +86,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62ef4c2",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a7610b3e",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
@@ -168,14 +166,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62ef4c2",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a7610b3e",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g1v0Filler.json
index 68abd6e8f..e4d5fffee 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g1v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g2v0Filler.json
index 36e8bc37c..061ae8a83 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g2v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g3v0Filler.json
index ba8ec51bb..56e3fb5ce 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000_d0g3v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g0v0Filler.json
index 38b1952f0..aa2c405f6 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g0v0Filler.json
@@ -86,14 +86,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62f278a",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a760d876",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
@@ -168,14 +166,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62f278a",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a760d876",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g1v0Filler.json
index 8604740e6..824d36236 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g1v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g2v0Filler.json
index ba672234d..ba843157a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g2v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g3v0Filler.json
index a853573d7..6a232dd9b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000_d0g3v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g0v0Filler.json
index f803cc3fa..17c2d6e56 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g0v0Filler.json
@@ -86,14 +86,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62f007a",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a760ff86",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
@@ -168,14 +166,12 @@
                         }
                     },
                     "0x3535353535353535353535353535353535353535" : {
-                        "balance" : "0x29a2241af62f007a",
                         "code" : "",
                         "nonce" : "0x00",
                         "storage" : {
                         }
                     },
                     "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
-                        "balance" : "0x0de0b6b3a760ff86",
                         "code" : "",
                         "nonce" : "0x02",
                         "storage" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g1v0Filler.json
index a486a53ae..ac570791a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g1v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g2v0Filler.json
index 9ecf0ff5d..e9f1414de 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g2v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g3v0Filler.json
index f4c65b23f..c7195bcf8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000_d0g3v0Filler.json
@@ -26,6 +26,166 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000001" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000002" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000003" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000004" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000005" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000006" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000007" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x0000000000000000000000000000000000000008" : {
+                        "balance" : "0x01",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x3535353535353535353535353535353535353535" : {
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
+                        "code" : "",
+                        "nonce" : "0x02",
+                        "storage" : {
+                        }
+                    },
+                    "0xc305c901078781c232a2a521c2af7980f8385ee9" : {
+                        "balance" : "0x00",
+                        "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d0g1v0Filler.json
index a7a9da8ac..d89d331c1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d0g1v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d0g2v0Filler.json
index f0bfcd522..af3de558c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d0g2v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d0g3v0Filler.json
index 8c3d936cc..c3002b78d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d0g3v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d10g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d10g1v0Filler.json
index a39dc7072..d83bdb68f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d10g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d10g1v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d10g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d10g2v0Filler.json
index 538711ea1..a6eeeb564 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d10g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d10g2v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d10g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d10g3v0Filler.json
index a98015abc..38febc09e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d10g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d10g3v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d11g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d11g1v0Filler.json
index f3f61ccd0..c8da06dba 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d11g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d11g1v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d11g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d11g2v0Filler.json
index 7bfbcfcbe..dd1c01e33 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d11g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d11g2v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d11g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d11g3v0Filler.json
index e3be30180..411ce2221 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d11g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d11g3v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d12g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d12g1v0Filler.json
index 071f02335..21119cd3c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d12g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d12g1v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d12g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d12g2v0Filler.json
index 7c2ec50ad..caa30a988 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d12g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d12g2v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d12g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d12g3v0Filler.json
index b1c9a271c..b84798e23 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d12g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d12g3v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d13g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d13g1v0Filler.json
index 102fb19cf..7a983f91d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d13g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d13g1v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d13g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d13g2v0Filler.json
index de51d3884..9785c1094 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d13g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d13g2v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d13g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d13g3v0Filler.json
index 6822c3af9..cf8189f41 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d13g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d13g3v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d14g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d14g1v0Filler.json
index 6f878e99e..6a3b7597a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d14g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d14g1v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d14g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d14g2v0Filler.json
index 137730e0c..24e91591e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d14g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d14g2v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d14g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d14g3v0Filler.json
index b4a9b2b57..4f64bdec1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d14g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d14g3v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d15g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d15g1v0Filler.json
index 06e39431b..0716b9faf 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d15g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d15g1v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d15g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d15g2v0Filler.json
index efb279d0e..4fe21cb16 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d15g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d15g2v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d15g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d15g3v0Filler.json
index 2fecdc2f8..5c1ee17f4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d15g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d15g3v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d16g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d16g1v0Filler.json
index da076ed4e..9185e8f64 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d16g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d16g1v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x02000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x02000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d16g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d16g2v0Filler.json
index a91052e30..0e285eb90 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d16g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d16g2v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x02000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x02000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d16g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d16g3v0Filler.json
index 2c1179bd0..e09cd0fd1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d16g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d16g3v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x02000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x02000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d17g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d17g1v0Filler.json
index 3119bd580..189e8c28b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d17g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d17g1v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x0200000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x0200000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d17g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d17g2v0Filler.json
index d527b8f89..d11189781 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d17g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d17g2v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x0200000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x0200000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d17g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d17g3v0Filler.json
index 11179d67d..483947fd0 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d17g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d17g3v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x0200000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x0200000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d18g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d18g1v0Filler.json
index b6478f611..0926fe50d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d18g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d18g1v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d18g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d18g2v0Filler.json
index 5f68d0288..9f2dbbc96 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d18g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d18g2v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d18g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d18g3v0Filler.json
index 204d74d05..103727e47 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d18g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d18g3v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d19g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d19g1v0Filler.json
index 47c6f9a0d..09a027ae9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d19g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d19g1v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d19g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d19g2v0Filler.json
index 6ff4c9a49..0061d7dd4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d19g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d19g2v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d19g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d19g3v0Filler.json
index eb5d3ebc3..dff7ba9f8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d19g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d19g3v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d1g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d1g1v0Filler.json
index 6a0132757..b4ec546fd 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d1g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d1g1v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d1g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d1g2v0Filler.json
index c3680ef0b..8157089f3 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d1g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d1g2v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d1g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d1g3v0Filler.json
index c2a3a105f..f8c56575e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d1g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d1g3v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d20g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d20g1v0Filler.json
index ab6bceda8..3e47d9528 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d20g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d20g1v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d20g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d20g2v0Filler.json
index cfada2bce..3b00e048f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d20g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d20g2v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d20g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d20g3v0Filler.json
index 71cb2e51a..0f6e99601 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d20g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d20g3v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d21g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d21g1v0Filler.json
index 48043e43c..ce6fc8d47 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d21g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d21g1v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d21g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d21g2v0Filler.json
index d6cb3e39d..c8f967e42 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d21g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d21g2v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d21g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d21g3v0Filler.json
index e0a4f4a79..82c2ea94e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d21g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d21g3v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d22g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d22g1v0Filler.json
index ae59a66aa..8765966bb 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d22g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d22g1v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d22g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d22g2v0Filler.json
index b65643216..c62da1803 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d22g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d22g2v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d22g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d22g3v0Filler.json
index f9ed7e8ab..07386de04 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d22g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d22g3v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d23g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d23g1v0Filler.json
index abe3a84fb..a686d61c3 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d23g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d23g1v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d23g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d23g2v0Filler.json
index 3e3d839f9..888880cba 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d23g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d23g2v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d23g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d23g3v0Filler.json
index 26b0912a3..42266b7e0 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d23g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d23g3v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d24g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d24g1v0Filler.json
index a8e7da83b..e545ebb89 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d24g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d24g1v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d24g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d24g2v0Filler.json
index 9bc347334..1dd62acdc 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d24g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d24g2v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d24g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d24g3v0Filler.json
index 5a0364be5..defb633d8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d24g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d24g3v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d25g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d25g1v0Filler.json
index eed5bf92d..33d8ba0ac 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d25g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d25g1v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d25g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d25g2v0Filler.json
index a1b0c9b9c..9a756b51a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d25g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d25g2v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d25g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d25g3v0Filler.json
index 1d2d491c4..e42a36508 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d25g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d25g3v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d26g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d26g1v0Filler.json
index cdcaf982c..e6290126b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d26g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d26g1v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d26g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d26g2v0Filler.json
index af7351e24..a9f8c0673 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d26g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d26g2v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d26g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d26g3v0Filler.json
index c1b76a423..38fe32ec6 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d26g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d26g3v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d27g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d27g1v0Filler.json
index 117c0dae5..18043ea61 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d27g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d27g1v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x02000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x02000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d27g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d27g2v0Filler.json
index f105416f9..4ad95e577 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d27g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d27g2v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x02000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x02000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d27g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d27g3v0Filler.json
index cd2484d2d..00ff8d79e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d27g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d27g3v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x02000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x02000000000000000000000000000000000000000000000000000000000000"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d28g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d28g1v0Filler.json
index 6f80caf27..6f13064d4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d28g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d28g1v0Filler.json
@@ -26,6 +26,44 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d28g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d28g2v0Filler.json
index 81b5d4def..8c5f5fc20 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d28g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d28g2v0Filler.json
@@ -26,6 +26,44 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d28g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d28g3v0Filler.json
index 3fdac5862..4b5ba472f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d28g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d28g3v0Filler.json
@@ -26,6 +26,44 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d29g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d29g1v0Filler.json
index f5221a6b1..9b55c5972 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d29g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d29g1v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d29g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d29g2v0Filler.json
index 209d1cdb8..74828e792 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d29g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d29g2v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d29g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d29g3v0Filler.json
index f6fa2017c..d88157e7d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d29g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d29g3v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d2g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d2g1v0Filler.json
index 2a6146da8..dcab148d4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d2g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d2g1v0Filler.json
@@ -26,6 +26,44 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d2g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d2g2v0Filler.json
index fdba3fe25..46b43aac8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d2g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d2g2v0Filler.json
@@ -26,6 +26,44 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d2g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d2g3v0Filler.json
index 4185254ce..6393c7114 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d2g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d2g3v0Filler.json
@@ -26,6 +26,44 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d30g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d30g1v0Filler.json
index e111e9ab2..9e33783e7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d30g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d30g1v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d30g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d30g2v0Filler.json
index b9a8f3ed6..dcebf031e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d30g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d30g2v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d30g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d30g3v0Filler.json
index b377d08d3..3ec3b11e9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d30g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d30g3v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d31g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d31g1v0Filler.json
index 5b3ba77fa..b4fa97514 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d31g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d31g1v0Filler.json
@@ -27,6 +27,26 @@
         ],
         "expect" : [
             {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
                 "network" : "Byzantium",
                 "result" : {
                     "0x1000000000000000000000000000000000000000" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d31g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d31g2v0Filler.json
index 08846e097..6d12027ce 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d31g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d31g2v0Filler.json
@@ -27,6 +27,26 @@
         ],
         "expect" : [
             {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
                 "network" : "Byzantium",
                 "result" : {
                     "0x1000000000000000000000000000000000000000" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d31g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d31g3v0Filler.json
index 046ae48a6..1512242d6 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d31g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d31g3v0Filler.json
@@ -27,6 +27,26 @@
         ],
         "expect" : [
             {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
                 "network" : "Byzantium",
                 "result" : {
                     "0x1000000000000000000000000000000000000000" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d32g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d32g1v0Filler.json
index 13e7de679..2bc959bb7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d32g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d32g1v0Filler.json
@@ -27,6 +27,26 @@
         ],
         "expect" : [
             {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
                 "network" : "Byzantium",
                 "result" : {
                     "0x1000000000000000000000000000000000000000" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d32g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d32g2v0Filler.json
index 4e6ab8c34..211b1f50c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d32g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d32g2v0Filler.json
@@ -27,6 +27,26 @@
         ],
         "expect" : [
             {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
                 "network" : "Byzantium",
                 "result" : {
                     "0x1000000000000000000000000000000000000000" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d32g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d32g3v0Filler.json
index d6f2ebce4..63251afee 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d32g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d32g3v0Filler.json
@@ -27,6 +27,26 @@
         ],
         "expect" : [
             {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
                 "network" : "Byzantium",
                 "result" : {
                     "0x1000000000000000000000000000000000000000" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d33g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d33g1v0Filler.json
index f91aaa32e..26e88d541 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d33g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d33g1v0Filler.json
@@ -27,6 +27,26 @@
         ],
         "expect" : [
             {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
                 "network" : "Byzantium",
                 "result" : {
                     "0x1000000000000000000000000000000000000000" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d33g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d33g2v0Filler.json
index 99ed59cef..e267a637c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d33g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d33g2v0Filler.json
@@ -27,6 +27,26 @@
         ],
         "expect" : [
             {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
                 "network" : "Byzantium",
                 "result" : {
                     "0x1000000000000000000000000000000000000000" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d33g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d33g3v0Filler.json
index 67d004694..9e632f814 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d33g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d33g3v0Filler.json
@@ -27,6 +27,26 @@
         ],
         "expect" : [
             {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
                 "network" : "Byzantium",
                 "result" : {
                     "0x1000000000000000000000000000000000000000" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d34g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d34g1v0Filler.json
index 7df88e93c..9d99ae130 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d34g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d34g1v0Filler.json
@@ -27,6 +27,26 @@
         ],
         "expect" : [
             {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
                 "network" : "Byzantium",
                 "result" : {
                     "0x1000000000000000000000000000000000000000" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d34g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d34g2v0Filler.json
index 3dda52618..523b57a77 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d34g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d34g2v0Filler.json
@@ -27,6 +27,26 @@
         ],
         "expect" : [
             {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
                 "network" : "Byzantium",
                 "result" : {
                     "0x1000000000000000000000000000000000000000" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d34g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d34g3v0Filler.json
index f088d2a83..72046a15e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d34g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d34g3v0Filler.json
@@ -27,6 +27,26 @@
         ],
         "expect" : [
             {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
                 "network" : "Byzantium",
                 "result" : {
                     "0x1000000000000000000000000000000000000000" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d35g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d35g1v0Filler.json
index ba6c85904..9ac11006f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d35g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d35g1v0Filler.json
@@ -27,6 +27,26 @@
         ],
         "expect" : [
             {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
                 "network" : "Byzantium",
                 "result" : {
                     "0x1000000000000000000000000000000000000000" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d35g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d35g2v0Filler.json
index df94d1a44..cdca07af1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d35g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d35g2v0Filler.json
@@ -27,6 +27,26 @@
         ],
         "expect" : [
             {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
                 "network" : "Byzantium",
                 "result" : {
                     "0x1000000000000000000000000000000000000000" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d35g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d35g3v0Filler.json
index d4bcd31df..fe5e8b2f8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d35g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d35g3v0Filler.json
@@ -27,6 +27,26 @@
         ],
         "expect" : [
             {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
                 "network" : "Byzantium",
                 "result" : {
                     "0x1000000000000000000000000000000000000000" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d36g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d36g1v0Filler.json
index 99c3e5f46..d20a2b2c4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d36g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d36g1v0Filler.json
@@ -26,6 +26,26 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d36g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d36g2v0Filler.json
index b4cb35ec9..378ee6fc8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d36g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d36g2v0Filler.json
@@ -26,6 +26,26 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d36g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d36g3v0Filler.json
index 34cb149bf..75bb00332 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d36g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d36g3v0Filler.json
@@ -26,6 +26,26 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d3g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d3g1v0Filler.json
index 5ad289bd3..9f12ce63f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d3g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d3g1v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x3b01b01ac41f2d6e917c6d6a221ce793802469026d9ab7578fa2e79e4da6aaab"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x3b01b01ac41f2d6e917c6d6a221ce793802469026d9ab7578fa2e79e4da6aaab"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d3g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d3g2v0Filler.json
index be5952040..0d27e0ee0 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d3g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d3g2v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x3b01b01ac41f2d6e917c6d6a221ce793802469026d9ab7578fa2e79e4da6aaab"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x3b01b01ac41f2d6e917c6d6a221ce793802469026d9ab7578fa2e79e4da6aaab"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d3g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d3g3v0Filler.json
index e43d30a3a..915a659bc 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d3g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d3g3v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x3b01b01ac41f2d6e917c6d6a221ce793802469026d9ab7578fa2e79e4da6aaab"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x3b01b01ac41f2d6e917c6d6a221ce793802469026d9ab7578fa2e79e4da6aaab"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d4g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d4g1v0Filler.json
index eb04daf46..25c9a8231 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d4g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d4g1v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x3b01b01ac41f2d6e917c6d6a221ce793802469026d9ab7578fa2e79e4da6aaab"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x3b01b01ac41f2d6e917c6d6a221ce793802469026d9ab7578fa2e79e4da6aaab"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d4g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d4g2v0Filler.json
index 7b93f65a5..0e3f2dc90 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d4g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d4g2v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x3b01b01ac41f2d6e917c6d6a221ce793802469026d9ab7578fa2e79e4da6aaab"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x3b01b01ac41f2d6e917c6d6a221ce793802469026d9ab7578fa2e79e4da6aaab"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d4g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d4g3v0Filler.json
index cfbcefe9d..fd1842fc9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d4g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d4g3v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x3b01b01ac41f2d6e917c6d6a221ce793802469026d9ab7578fa2e79e4da6aaab"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x3b01b01ac41f2d6e917c6d6a221ce793802469026d9ab7578fa2e79e4da6aaab"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d5g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d5g1v0Filler.json
index 35fd2930d..a9f9c65e1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d5g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d5g1v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d5g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d5g2v0Filler.json
index 9bfaefb6c..04cf94e94 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d5g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d5g2v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d5g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d5g3v0Filler.json
index 1a11dbdc2..b02471222 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d5g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d5g3v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d6g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d6g1v0Filler.json
index cf5f7cb81..fe51a508e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d6g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d6g1v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d6g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d6g2v0Filler.json
index fe6d146e2..f67422114 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d6g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d6g2v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d6g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d6g3v0Filler.json
index 3c05a97aa..71d740e04 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d6g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d6g3v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d7g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d7g1v0Filler.json
index 6c0435176..e8015006a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d7g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d7g1v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d7g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d7g2v0Filler.json
index b3e4ff74a..0e5691d8b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d7g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d7g2v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d7g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d7g3v0Filler.json
index 128d28ace..ba7fd3c68 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d7g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d7g3v0Filler.json
@@ -26,6 +26,48 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d8g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d8g1v0Filler.json
index 0586d0839..b0228788f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d8g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d8g1v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d8g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d8g2v0Filler.json
index 01227bd3c..857822302 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d8g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d8g2v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d8g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d8g3v0Filler.json
index f6d1731ed..6962195d1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d8g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d8g3v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d9g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d9g1v0Filler.json
index e519e2ba0..2a187d7f7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d9g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d9g1v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d9g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d9g2v0Filler.json
index 764d8a5a4..74a477aca 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d9g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d9g2v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d9g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d9g3v0Filler.json
index a014d154f..d8e4e27c9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d9g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d9g3v0Filler.json
@@ -26,6 +26,46 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexpFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexpFiller.json
index b97594dc9..1e47922f4 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexpFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexpFiller.json
@@ -12,7 +12,7 @@
 	    {
                 "indexes" : {
                     "data" : -1,
-                    "gas" : 0,
+                    "gas" : -1,
                     "value" : -1
                 },
                 "network" : [ "EIP150", "EIP158"],
@@ -28,7 +28,7 @@
             {
                 "indexes" : {
                     "data" : [0,6,7],
-                    "gas" : 0,
+                    "gas" : -1,
                     "value" : -1
                 },
                 "network" : [">=Byzantium"],
@@ -44,7 +44,7 @@
             {
                 "indexes" : {
                     "data" : [29],
-                    "gas" : 0,
+                    "gas" : -1,
                     "value" : -1
                 },
                 "network" : [">=Byzantium"],
@@ -60,7 +60,7 @@
 	    {
                 "indexes" : {
                     "data" : [1,5,8,9,10,12,13,15,18,19,20,21,22,23,24,30],
-                    "gas" : 0,
+                    "gas" : -1,
                     "value" : -1
                 },
                 "network" : [">=Byzantium"],
@@ -76,7 +76,7 @@
 	    {
                 "indexes" : {
                     "data" : [2,28],
-                    "gas" : 0,
+                    "gas" : -1,
                     "value" : -1
                 },
                 "network" : [">=Byzantium"],
@@ -172,7 +172,7 @@
 	    {
                 "indexes" : {
                     "data" : [3,4],
-                    "gas" : 0,
+                    "gas" : -1,
                     "value" : -1
                 },
                 "network" : [">=Byzantium"],
@@ -188,7 +188,7 @@
 	    {
                 "indexes" : {
                     "data" : [11, 14, 25, 26],
-                    "gas" : 0,
+                    "gas" : -1,
                     "value" : -1
                 },
                 "network" : [">=Byzantium"],
@@ -204,7 +204,7 @@
 	    {
                 "indexes" : {
                     "data" : [16,27],
-                    "gas" : 0,
+                    "gas" : -1,
                     "value" : -1
                 },
                 "network" : [">=Byzantium"],
@@ -220,7 +220,7 @@
 	    {
                 "indexes" : {
                     "data" : [17],
-                    "gas" : 0,
+                    "gas" : -1,
                     "value" : -1
                 },
                 "network" : [">=Byzantium"],
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_1000000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_1000000Filler.json
index f35841d6b..7ea99cffe 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_1000000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_1000000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_155000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_155000Filler.json
index 63311cdcf..2bb893905 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_155000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_155000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_1000000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_1000000Filler.json
index b69dc4a89..319a395b9 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_1000000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_1000000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_155000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_155000Filler.json
index 05e9a9f2d..cffd84308 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_155000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_155000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_20500Filler.json
index 617b4f557..edc1543c9 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_20500Filler.json
@@ -169,6 +169,84 @@
                         "storage": {}
                     }
                 }
+            },
+	    {
+                "indexes": {
+                    "data": 0,
+                    "gas": [1,2,3],
+                    "value": 0
+                },
+                "network": [
+                    ">=Byzantium"
+                ],
+                "result": {
+                    "0000000000000000000000000000000000000001": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "c305c901078781c232a2a521c2af7980f8385ee9": {
+                        "balance": "0",
+                        "nonce": "1",
+                        "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "storage": {
+			    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+			}
+                    },
+                    "0000000000000000000000000000000000000005": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000008": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000003": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
+                        "nonce": "2",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000006": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000007": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000004": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "3535353535353535353535353535353535353535": {
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000002": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    }
+                }
             }
         ],
         "explanation": "Puts the base 0, exponent 1 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas"
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_22000Filler.json
index 886334b49..76fe22e98 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_22000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_25000Filler.json
index 9a705beee..4124de8bb 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_25000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_35000Filler.json
index c4bf0e4b8..52078c142 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_35000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_1000000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_1000000Filler.json
index 06d58bef3..cd1a2856c 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_1000000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_1000000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_155000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_155000Filler.json
index bb371fec5..15c714e8f 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_155000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_155000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_20500Filler.json
index 20acfe136..f351a1d08 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_20500Filler.json
@@ -169,6 +169,84 @@
                         "storage": {}
                     }
                 }
+            },
+	    {
+                "indexes": {
+                    "data": 0,
+                    "gas": [1,2,3],
+                    "value": 0
+                },
+                "network": [
+                    ">=Byzantium"
+                ],
+                "result": {
+                    "0000000000000000000000000000000000000001": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "c305c901078781c232a2a521c2af7980f8385ee9": {
+                        "balance": "0",
+                        "nonce": "1",
+                        "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "storage": {
+			    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+			}
+                    },
+                    "0000000000000000000000000000000000000005": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000008": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000003": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
+                        "nonce": "2",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000006": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000007": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000004": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "3535353535353535353535353535353535353535": {
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000002": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    }
+                }
             }
         ],
         "explanation": "Puts the base 0, exponent 3 and modulus 100 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas"
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_22000Filler.json
index fc551da26..c3fea4cc8 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_22000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_25000Filler.json
index 208407efb..db851a2cb 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_25000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_35000Filler.json
index ad7998141..d8a446560 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_35000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_1000000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_1000000Filler.json
index 9995a0f0b..25e5360f8 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_1000000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_1000000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_155000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_155000Filler.json
index f0d62b5e6..23cd99edc 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_155000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_155000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_20500Filler.json
index a1423fe3b..d32a9204a 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_20500Filler.json
@@ -169,6 +169,84 @@
                         "storage": {}
                     }
                 }
+            },
+	    {
+                "indexes": {
+                    "data": 0,
+                    "gas": [1,2,3],
+                    "value": 0
+                },
+                "network": [
+                    ">=Byzantium"
+                ],
+                "result": {
+                    "0000000000000000000000000000000000000001": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "c305c901078781c232a2a521c2af7980f8385ee9": {
+                        "balance": "0",
+                        "nonce": "1",
+                        "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "storage": {
+			    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+			}
+                    },
+                    "0000000000000000000000000000000000000005": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000008": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000003": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
+                        "nonce": "2",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000006": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000007": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000004": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "3535353535353535353535353535353535353535": {
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000002": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    }
+                }
             }
         ],
         "explanation": "Puts the base 1, exponent 0 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas"
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_22000Filler.json
index f280760c1..7a7015f4c 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_22000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_25000Filler.json
index 6005b1a63..07c3d3684 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_25000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_35000Filler.json
index 01c6a7258..612254635 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_35000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_1000000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_1000000Filler.json
index 8a0506b0c..f298e1a8f 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_1000000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_1000000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_155000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_155000Filler.json
index a14ef96d7..2266b8f72 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_155000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_155000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_20500Filler.json
index 9b969d47c..68e7835ce 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_20500Filler.json
@@ -169,6 +169,84 @@
                         "storage": {}
                     }
                 }
+            },
+	    {
+                "indexes": {
+                    "data": 0,
+                    "gas": [1,2,3],
+                    "value": 0
+                },
+                "network": [
+                    ">=Byzantium"
+                ],
+                "result": {
+                    "0000000000000000000000000000000000000001": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "c305c901078781c232a2a521c2af7980f8385ee9": {
+                        "balance": "0",
+                        "nonce": "1",
+                        "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "storage": {
+			    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+			}
+                    },
+                    "0000000000000000000000000000000000000005": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000008": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000003": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
+                        "nonce": "2",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000006": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000007": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000004": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "3535353535353535353535353535353535353535": {
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000002": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    }
+                }
             }
         ],
         "explanation": "Puts the base 1, exponent 0 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas"
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_22000Filler.json
index f51d92b1a..35bcf4c07 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_22000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_25000Filler.json
index 3a6c53721..283234d80 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_25000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_35000Filler.json
index 94a11a9f9..6c9951668 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_35000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_1000000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_1000000Filler.json
index 607cc12d3..a41aa7cd4 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_1000000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_1000000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_155000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_155000Filler.json
index 2698a029d..e48b5908d 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_155000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_155000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_20500Filler.json
index 4ab36a0e8..b2f65a49b 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_20500Filler.json
@@ -169,6 +169,84 @@
                         "storage": {}
                     }
                 }
+            },
+	    {
+                "indexes": {
+                    "data": 0,
+                    "gas": [1,2,3],
+                    "value": 0
+                },
+                "network": [
+                    ">=Byzantium"
+                ],
+                "result": {
+                    "0000000000000000000000000000000000000001": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "c305c901078781c232a2a521c2af7980f8385ee9": {
+                        "balance": "0",
+                        "nonce": "1",
+                        "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "storage": {
+			    "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+			}
+                    },
+                    "0000000000000000000000000000000000000005": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000008": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000003": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
+                        "nonce": "2",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000006": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000007": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000004": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "3535353535353535353535353535353535353535": {
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000002": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    }
+                }
             }
         ],
         "explanation": "Puts the base 1, exponent 1 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas"
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_22000Filler.json
index d20e27a78..75ef0e992 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_22000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_25000Filler.json
index 5ad5a5f4c..ff32eb0df 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_25000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_35000Filler.json
index 0e1cbb583..d029fc517 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_35000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_22411_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_22411_22000Filler.json
index 05eb5b16a..f27127ab2 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_22411_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_22411_22000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
@@ -133,7 +133,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999806270",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -157,7 +156,6 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "193730",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_1000000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_1000000Filler.json
index 31bab11c2..b872aca33 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_1000000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_1000000Filler.json
@@ -170,6 +170,84 @@
                         "storage": {}
                     }
                 }
+            },
+	    {
+                "indexes": {
+                    "data": 0,
+                    "gas": [1,2,3],
+                    "value": 0
+                },
+                "network": [
+                    ">=Byzantium"
+                ],
+                "result": {
+                    "0000000000000000000000000000000000000001": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "c305c901078781c232a2a521c2af7980f8385ee9": {
+                        "balance": "0",
+                        "nonce": "1",
+                        "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "storage": {
+                            "0x00": "0x00"
+                        }
+                    },
+                    "0000000000000000000000000000000000000005": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000008": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000003": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
+                        "nonce": "2",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000006": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000007": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000004": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "3535353535353535353535353535353535353535": {
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000002": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    }
+                }
             }
         ],
         "explanation": "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas"
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_155000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_155000Filler.json
index dcb39ba1d..b6935a798 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_155000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_155000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
@@ -133,7 +133,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999673526",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -157,7 +156,6 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "326474",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_20500Filler.json
index 0f9d3059a..da674117f 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_20500Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
@@ -133,7 +133,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999808026",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -157,7 +156,6 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "191974",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_22000Filler.json
index fb00d939c..c66b49aec 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_22000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
@@ -133,7 +133,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999806526",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -157,7 +156,6 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "193474",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_25000Filler.json
index 2ee6044de..7a3d4f6bc 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_25000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
@@ -133,7 +133,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999803526",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -157,7 +156,6 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "196474",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_35000Filler.json
index 48fecc536..afe956e7f 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_35000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
@@ -133,7 +133,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999793526",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -157,7 +156,6 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "206474",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_1000000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_1000000Filler.json
index 51ae91a81..454ddecc6 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_1000000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_1000000Filler.json
@@ -170,6 +170,84 @@
                         "storage": {}
                     }
                 }
+            },
+	    {
+                "indexes": {
+                    "data": 0,
+                    "gas": [1,2,3],
+                    "value": 0
+                },
+                "network": [
+                    ">=Byzantium"
+                ],
+                "result": {
+                    "0000000000000000000000000000000000000001": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "c305c901078781c232a2a521c2af7980f8385ee9": {
+                        "balance": "0",
+                        "nonce": "1",
+                        "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "storage": {
+                            "0x00": "0x00"
+                        }
+                    },
+                    "0000000000000000000000000000000000000005": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000008": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000003": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
+                        "nonce": "2",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000006": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000007": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000004": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "3535353535353535353535353535353535353535": {
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000002": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    }
+                }
             }
         ],
         "explanation": "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas"
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_155000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_155000Filler.json
index 2961f82c3..192aa1250 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_155000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_155000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
@@ -133,7 +133,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999673270",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -157,7 +156,6 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "326730",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_20500Filler.json
index 259bfed5d..692d9107c 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_20500Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
@@ -133,7 +133,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999807770",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -157,7 +156,6 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "192230",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_25000Filler.json
index d72022901..a106a1f0e 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_25000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
@@ -133,7 +133,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999803270",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -157,7 +156,6 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "196730",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_35000Filler.json
index 39214bf76..cb064ea31 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_35000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
@@ -133,7 +133,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999793270",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -157,7 +156,6 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "206730",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_1000000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_1000000Filler.json
index 2bb4325fe..0fe60c1ea 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_1000000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_1000000Filler.json
@@ -170,6 +170,84 @@
                         "storage": {}
                     }
                 }
+            },
+	    {
+                "indexes": {
+                    "data": 0,
+                    "gas": [1,2,3],
+                    "value": 0
+                },
+                "network": [
+                    ">=Byzantium"
+                ],
+                "result": {
+                    "0000000000000000000000000000000000000001": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "c305c901078781c232a2a521c2af7980f8385ee9": {
+                        "balance": "0",
+                        "nonce": "1",
+                        "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "storage": {
+                            "0x00": "0x00"
+                        }
+                    },
+                    "0000000000000000000000000000000000000005": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000008": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000003": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
+                        "nonce": "2",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000006": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000007": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000004": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "3535353535353535353535353535353535353535": {
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000002": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    }
+                }
             }
         ],
         "explanation": "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas"
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_155000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_155000Filler.json
index fa3e873c2..7acf70b6b 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_155000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_155000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
@@ -133,7 +133,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999664758",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -157,7 +156,6 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "335242",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_20500Filler.json
index ab4bd5997..c9d2c7b55 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_20500Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
@@ -133,7 +133,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999799258",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -157,7 +156,6 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "200742",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_22000Filler.json
index baedfb1e9..c4363d6a7 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_22000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
@@ -133,7 +133,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999797758",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -157,7 +156,6 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "202242",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_25000Filler.json
index b560aa5b8..dc3cac00b 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_25000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
@@ -133,7 +133,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999794758",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -157,7 +156,6 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "205242",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_35000Filler.json
index 8a6ee5b94..bce361fb0 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_35000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
@@ -133,7 +133,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999784758",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -157,7 +156,6 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "215242",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_1000000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_1000000Filler.json
index 8b9c44062..982f2a48b 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_1000000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_1000000Filler.json
@@ -170,6 +170,84 @@
                         "storage": {}
                     }
                 }
+            },
+	    {
+                "indexes": {
+                    "data": 0,
+                    "gas": [1,2,3],
+                    "value": 0
+                },
+                "network": [
+                    ">=Byzantium"
+                ],
+                "result": {
+                    "0000000000000000000000000000000000000001": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "c305c901078781c232a2a521c2af7980f8385ee9": {
+                        "balance": "0",
+                        "nonce": "1",
+                        "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "storage": {
+                            "0x00": "0x0"
+                        }
+                    },
+                    "0000000000000000000000000000000000000005": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000008": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000003": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
+                        "nonce": "2",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000006": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000007": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000004": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "3535353535353535353535353535353535353535": {
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000002": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    }
+                }
             }
         ],
         "explanation": "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 97 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas"
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_155000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_155000Filler.json
index 9e179c433..c13872f7a 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_155000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_155000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
@@ -133,7 +133,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999673270",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -157,7 +156,6 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "326730",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_20500Filler.json
index 864b2ee94..1d333f77e 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_20500Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
@@ -133,7 +133,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999807770",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -157,7 +156,6 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "192230",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_22000Filler.json
index e39e39731..e6e09d4d7 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_22000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
@@ -133,7 +133,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999806270",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -157,7 +156,6 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "193730",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_25000Filler.json
index d9f04fd4f..bc8b36e17 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_25000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
@@ -133,7 +133,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999803270",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -157,7 +156,6 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "196730",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_35000Filler.json
index e7dd8b6cc..d6d7e6dcd 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_35000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
@@ -133,7 +133,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999793270",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -157,7 +156,6 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "206730",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_1000000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_1000000Filler.json
index ef66f5576..f5e8ded1f 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_1000000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_1000000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_155000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_155000Filler.json
index 9b1918283..52429220f 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_155000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_155000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_20500Filler.json
index 9c13aee72..abab09b82 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_20500Filler.json
@@ -169,6 +169,84 @@
                         "storage": {}
                     }
                 }
+            },
+	    {
+                "indexes": {
+                    "data": 0,
+                    "gas": [1,2,3],
+                    "value": 0
+                },
+                "network": [
+                    ">=Byzantium"
+                ],
+                "result": {
+                    "0000000000000000000000000000000000000001": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "c305c901078781c232a2a521c2af7980f8385ee9": {
+                        "balance": "0",
+                        "nonce": "1",
+                        "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "storage": {
+			    "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe"
+			}
+                    },
+                    "0000000000000000000000000000000000000005": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000008": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000003": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
+                        "nonce": "2",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000006": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000007": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000004": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "3535353535353535353535353535353535353535": {
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000002": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    }
+                }
             }
         ],
         "explanation": "Puts the base 115792089237316195423570985008687907853269984665640564039457584007913129639936, exponent 1 and modulus 21847450052839212624230656502990235142567050104912751880812823948662932355201 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas"
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_22000Filler.json
index e0d019f58..52873b3d1 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_22000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_25000Filler.json
index 7d59aa09e..0cf4dc6a7 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_25000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_35000Filler.json
index b12d18e3d..1c8e3cdd6 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_35000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_1000000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_1000000Filler.json
index f9c4df3ac..644c35308 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_1000000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_1000000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_155000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_155000Filler.json
index 291234265..6de9ee2d4 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_155000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_155000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_22000Filler.json
index 7dc0309a7..d7469fbc5 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_22000Filler.json
@@ -169,6 +169,84 @@
                         "storage": {}
                     }
                 }
+            },
+	    {
+                "indexes": {
+                    "data": 0,
+                    "gas": [1,2,3],
+                    "value": 0
+                },
+                "network": [
+                    ">=Byzantium"
+                ],
+                "result": {
+                    "0000000000000000000000000000000000000001": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "c305c901078781c232a2a521c2af7980f8385ee9": {
+                        "balance": "0",
+                        "nonce": "1",
+                        "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "storage": {
+			    "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+			}
+                    },
+                    "0000000000000000000000000000000000000005": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000008": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000003": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
+                        "nonce": "2",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000006": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000007": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000004": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "3535353535353535353535353535353535353535": {
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000002": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    }
+                }
             }
         ],
         "explanation": "Puts the base 3, exponent 28948022309329048855892746252171976963317496166410141009864396001978282409984 and modulus 115792089237316195423570985008687907853269984665640564039457584007913129639936 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas"
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_25000Filler.json
index 84a2efa84..60b651e14 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_25000Filler.json
@@ -170,6 +170,85 @@
                         "storage": {}
                     }
                 }
+            },
+	    {
+                "indexes": {
+                    "data": 0,
+                    "gas": [1,2,3],
+                    "value": 0
+                },
+                "network": [
+                    ">=Byzantium"
+                ],
+                "result": {
+                    "0000000000000000000000000000000000000001": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "c305c901078781c232a2a521c2af7980f8385ee9": {
+                        "balance": "0",
+                        "nonce": "1",
+                        "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "storage": {
+                            "0x00": "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    },
+                    "0000000000000000000000000000000000000005": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000008": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000003": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
+                        "nonce": "2",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000006": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000007": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000004": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "3535353535353535353535353535353535353535": {
+                        "balance": "190113",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000002": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    }
+                }
             }
         ],
         "explanation": "Puts the base 3, exponent 28948022309329048855892746252171976963317496166410141009864396001978282409984 and modulus 115792089237316195423570985008687907853269984665640564039457584007913129639936 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas"
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_35000Filler.json
index 76f41ff5c..fcdc91828 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_35000Filler.json
@@ -170,6 +170,85 @@
                         "storage": {}
                     }
                 }
+            },
+	    {
+                "indexes": {
+                    "data": 0,
+                    "gas": [1,2,3],
+                    "value": 0
+                },
+                "network": [
+                    ">=Byzantium"
+                ],
+                "result": {
+                    "0000000000000000000000000000000000000001": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "c305c901078781c232a2a521c2af7980f8385ee9": {
+                        "balance": "0",
+                        "nonce": "1",
+                        "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "storage": {
+                            "0x00": "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                        }
+                    },
+                    "0000000000000000000000000000000000000005": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000008": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000003": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
+                        "nonce": "2",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000006": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000007": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000004": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "3535353535353535353535353535353535353535": {
+                        "balance": "190113",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000002": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    }
+                }
             }
         ],
         "explanation": "Puts the base 3, exponent 28948022309329048855892746252171976963317496166410141009864396001978282409984 and modulus 115792089237316195423570985008687907853269984665640564039457584007913129639936 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas"
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_28948_11579_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_28948_11579_20500Filler.json
index d35578f10..3a47dd11f 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_28948_11579_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_28948_11579_20500Filler.json
@@ -169,6 +169,84 @@
                         "storage": {}
                     }
                 }
+            },
+	    {
+                "indexes": {
+                    "data": 0,
+                    "gas": [1,2,3],
+                    "value": 0
+                },
+                "network": [
+                    ">=Byzantium"
+                ],
+                "result": {
+                    "0000000000000000000000000000000000000001": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "c305c901078781c232a2a521c2af7980f8385ee9": {
+                        "balance": "0",
+                        "nonce": "1",
+                        "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "storage": {
+			    "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+			}
+                    },
+                    "0000000000000000000000000000000000000005": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000008": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000003": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
+                        "nonce": "2",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000006": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000007": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000004": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "3535353535353535353535353535353535353535": {
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000002": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    }
+                }
             }
         ],
         "explanation": "Puts the base 3, exponent 28948022309329048855892746252171976963317496166410141009864396001978282409984 and modulus 115792089237316195423570985008687907853269984665640564039457584007913129639936 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas"
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_1000000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_1000000Filler.json
index 6f8b2d851..28369ed6d 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_1000000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_1000000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_155000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_155000Filler.json
index 4ae66fb10..9f90ff856 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_155000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_155000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_20500Filler.json
index 745c1154f..4b4991812 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_20500Filler.json
@@ -169,6 +169,86 @@
                         "storage": {}
                     }
                 }
+            },
+	    {
+                "indexes": {
+                    "data": 0,
+                    "gas": [1,2,3],
+                    "value": 0
+                },
+                "network": [
+                    ">=Byzantium"
+                ],
+                "result": {
+                    "0000000000000000000000000000000000000001": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "c305c901078781c232a2a521c2af7980f8385ee9": {
+                        "balance": "0",
+                        "nonce": "1",
+                        "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "storage": {
+			    "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8"
+			}
+                    },
+                    "0000000000000000000000000000000000000005": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000008": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000003": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
+                        "balance": "999999999999824001",
+                        "nonce": "2",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000006": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000007": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000004": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "3535353535353535353535353535353535353535": {
+                        "balance": "175999",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000002": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    }
+                }
             }
         ],
         "explanation": "Puts the base 3, exponent 5 and modulus 100 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas"
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_22000Filler.json
index 493963383..8ec616fcc 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_22000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_25000Filler.json
index c0a943c20..66d16151f 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_25000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_35000Filler.json
index 7830ea491..f5a989d26 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_35000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_1000000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_1000000Filler.json
index 8d2c7cb7c..0f8d91427 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_1000000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_1000000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_155000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_155000Filler.json
index b552ca20f..83f43fc31 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_155000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_155000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_20500Filler.json
index 02b108bd6..4be209cbc 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_20500Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": [0],
                     "value": 0
                 },
                 "network": [
@@ -169,6 +169,86 @@
                         "storage": {}
                     }
                 }
+            },
+	    {
+                "indexes": {
+                    "data": 0,
+                    "gas": [1,2,3],
+                    "value": 0
+                },
+                "network": [
+                    ">=Byzantium"
+                ],
+                "result": {
+                    "0000000000000000000000000000000000000001": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "c305c901078781c232a2a521c2af7980f8385ee9": {
+                        "balance": "0",
+                        "nonce": "1",
+                        "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "storage": {
+			    "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+			}
+                    },
+                    "0000000000000000000000000000000000000005": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000008": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000003": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
+                        "balance": "999999999999823871",
+                        "nonce": "2",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000006": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000007": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000004": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "3535353535353535353535353535353535353535": {
+                        "balance": "176129",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000002": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    }
+                }
             }
         ],
         "explanation": "Puts the base 49, exponent 2401 and modulus 2401 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas"
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_22000Filler.json
index 6006d7d7a..31f7e4990 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_22000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_25000Filler.json
index 22f3337ea..b1510a856 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_25000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_35000Filler.json
index ff0ff7a53..6af336a34 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_35000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_1000000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_1000000Filler.json
index ba39330ae..919b842f7 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_1000000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_1000000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_155000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_155000Filler.json
index 68dd4dd16..df850926b 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_155000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_155000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_20500Filler.json
index 8d81652d7..70e337f94 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_20500Filler.json
@@ -169,6 +169,84 @@
                         "storage": {}
                     }
                 }
+            },
+	    {
+                "indexes": {
+                    "data": 0,
+                    "gas": [1,2,3],
+                    "value": 0
+                },
+                "network": [
+                    ">=Byzantium"
+                ],
+                "result": {
+                    "0000000000000000000000000000000000000001": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "c305c901078781c232a2a521c2af7980f8385ee9": {
+                        "balance": "0",
+                        "nonce": "1",
+                        "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "storage": {
+			    "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+			}
+                    },
+                    "0000000000000000000000000000000000000005": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000008": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000003": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
+                        "nonce": "2",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000006": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000007": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000004": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "3535353535353535353535353535353535353535": {
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000002": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    }
+                }
             }
         ],
         "explanation": "Puts the base 21847450052839212624230656502990235142567050104912751880812823948662932355190, exponent 21847450052839212624230656502990235142567050104912751880812823948662932355190 and modulus 1461501637330902918203684832716283019655932542965 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas"
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_22000Filler.json
index 7c22710e9..ee5c99f0c 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_22000Filler.json
@@ -169,6 +169,84 @@
                         "storage": {}
                     }
                 }
+            },
+	    {
+                "indexes": {
+                    "data": 0,
+                    "gas": [1,2,3],
+                    "value": 0
+                },
+                "network": [
+                    ">=Byzantium"
+                ],
+                "result": {
+                    "0000000000000000000000000000000000000001": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "c305c901078781c232a2a521c2af7980f8385ee9": {
+                        "balance": "0",
+                        "nonce": "1",
+                        "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "storage": {
+			    "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+			}
+                    },
+                    "0000000000000000000000000000000000000005": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000008": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000003": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
+                        "nonce": "2",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000006": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000007": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000004": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "3535353535353535353535353535353535353535": {
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000002": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    }
+                }
             }
         ],
         "explanation": "Puts the base 21847450052839212624230656502990235142567050104912751880812823948662932355190, exponent 21847450052839212624230656502990235142567050104912751880812823948662932355190 and modulus 1461501637330902918203684832716283019655932542965 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas"
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_25000Filler.json
index d470add7b..70c90e0e7 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_25000Filler.json
@@ -170,6 +170,85 @@
                         "storage": {}
                     }
                 }
+            },
+	    {
+                "indexes": {
+                    "data": 0,
+                    "gas": [1,2,3],
+                    "value": 0
+                },
+                "network": [
+                    ">=Byzantium"
+                ],
+                "result": {
+                    "0000000000000000000000000000000000000001": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "c305c901078781c232a2a521c2af7980f8385ee9": {
+                        "balance": "0",
+                        "nonce": "1",
+                        "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "storage": {
+                            "0x00": "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                        }
+                    },
+                    "0000000000000000000000000000000000000005": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000008": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000003": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
+                        "nonce": "2",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000006": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000007": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000004": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "3535353535353535353535353535353535353535": {
+                        "balance": "194405",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000002": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    }
+                }
             }
         ],
         "explanation": "Puts the base 21847450052839212624230656502990235142567050104912751880812823948662932355190, exponent 21847450052839212624230656502990235142567050104912751880812823948662932355190 and modulus 1461501637330902918203684832716283019655932542965 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas"
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_35000Filler.json
index 6b3929ec6..173f9c524 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_35000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_1000000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_1000000Filler.json
index 3c9a2d2f2..485602957 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_1000000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_1000000Filler.json
@@ -170,6 +170,84 @@
                         "storage": {}
                     }
                 }
+            },
+	    {
+                "indexes": {
+                    "data": 0,
+                    "gas": [1,2,3],
+                    "value": 0
+                },
+                "network": [
+                    ">=Byzantium"
+                ],
+                "result": {
+                    "0000000000000000000000000000000000000001": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "c305c901078781c232a2a521c2af7980f8385ee9": {
+                        "balance": "0",
+                        "nonce": "1",
+                        "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b",
+                        "storage": {
+                            "0x00": "0x00"
+                        }
+                    },
+                    "0000000000000000000000000000000000000005": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000008": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000003": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
+                        "nonce": "2",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000006": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000007": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000004": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "3535353535353535353535353535353535353535": {
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    },
+                    "0000000000000000000000000000000000000002": {
+                        "balance": "1",
+                        "nonce": "0",
+                        "code": "0x",
+                        "storage": {}
+                    }
+                }
             }
         ],
         "explanation": "Puts the base 9, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas"
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_155000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_155000Filler.json
index da2416e3c..581db479b 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_155000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_155000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
@@ -133,7 +133,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999673270",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -157,7 +156,6 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "326730",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_20500Filler.json
index 34f444590..b7a779743 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_20500Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
@@ -133,7 +133,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999807770",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -157,7 +156,6 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "192230",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_22000Filler.json
index b757da4a3..bd704e37f 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_22000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
@@ -133,7 +133,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999806270",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -157,7 +156,6 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "193730",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_35000Filler.json
index 1f6fe05ab..8174fe6df 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_35000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
@@ -133,7 +133,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999793270",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -157,7 +156,6 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "206730",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_3711_37111_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_3711_37111_25000Filler.json
index 9fc6bd036..dd9cae5c7 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_3711_37111_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_3711_37111_25000Filler.json
@@ -95,7 +95,7 @@
             {
                 "indexes": {
                     "data": 0,
-                    "gas": 0,
+                    "gas": -1,
                     "value": 0
                 },
                 "network": [
@@ -133,7 +133,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999803270",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -157,7 +156,6 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "196730",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
author	Dimitry <dimitry@ethereum.org>	2018-02-16 01:59:47 +0800
committer	Dimitry <dimitry@ethereum.org>	2018-02-16 01:59:47 +0800
commit	f62640eeabf3066fa9726c8a61dfa5d50e7daf44 (patch)
tree	29090a23ca6c34b99a5ff3905637118b19b78909 /src
parent	772a3d69a704e0670f567abefb6608f942136693 (diff)
download	tangerine-tests-f62640eeabf3066fa9726c8a61dfa5d50e7daf44.tar tangerine-tests-f62640eeabf3066fa9726c8a61dfa5d50e7daf44.tar.gz tangerine-tests-f62640eeabf3066fa9726c8a61dfa5d50e7daf44.tar.bz2 tangerine-tests-f62640eeabf3066fa9726c8a61dfa5d50e7daf44.tar.lz tangerine-tests-f62640eeabf3066fa9726c8a61dfa5d50e7daf44.tar.xz tangerine-tests-f62640eeabf3066fa9726c8a61dfa5d50e7daf44.tar.zst tangerine-tests-f62640eeabf3066fa9726c8a61dfa5d50e7daf44.zip